Skip to content

sysbuild: Add QSPI XIP split image flag setting for DirectXIP mode #17227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Sep 11, 2024
Merged

sysbuild: Add QSPI XIP split image flag setting for DirectXIP mode #17227

merged 2 commits into from
Sep 11, 2024

Conversation

@nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Sep 9, 2024 

Sets a flag for MCUmgr img mgmt to allow uploading to the correct
slot when using these specific configuration options

@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 9, 2024
@nordicjm nordicjm removed manifest-zephyr changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 9, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 9, 2024 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@e734c84 nrfconnect/sdk-zephyr@6debbaf (main) nrfconnect/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 9, 2024 •
edited
Loading

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 5

Inputs:

Sources:

sdk-nrf: PR head: b0330985a70413aa05cdca62ababef61437e6638
zephyr: PR head: 6debbaf8115c13f31fca0d6acdadfad153e413b4

more details

sdk-nrf:

PR head: b0330985a70413aa05cdca62ababef61437e6638
merge base: ab2f82ad5ced6fc744acaa9b8dafa7ead4f12fbd
target head (main): ab2f82ad5ced6fc744acaa9b8dafa7ead4f12fbd
Diff

zephyr:

PR head: 6debbaf8115c13f31fca0d6acdadfad153e413b4
merge base: e734c8433f00bef70f08c682313e19792dc07ad8
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (4) 
sysbuild
│  │ CMakeLists.txt
west.yml
zephyr
│  ├── subsys
│  │  ├── mgmt
│  │  │  ├── mcumgr
│  │  │  │  ├── grp
│  │  │  │  │  ├── img_mgmt
│  │  │  │  │  │  ├── Kconfig
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ img_mgmt.c

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain
  • ◻️ Build twister
  • ◻️ Integration tests
    • ◻️ test-sdk-audio
    • ◻️ test-fw-nrfconnect-boot
    • ◻️ test-fw-nrfconnect-chip
    • ◻️ test-fw-nrfconnect-rs
    • ◻️ test-fw-nrfconnect-fem
    • ◻️ test-fw-nrfconnect-zigbee
    • ◻️ test-sdk-sidewalk
    • ◻️ test-sdk-mcuboot
    • ◻️ test-sdk-dfu
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-low-level
    • test-sdk-find-my
    • test-sdk-pmic-samples
    • test-sdk-wifi

Note: This message is automatically posted and updated by the CI

@nordicjm nordicjm force-pushed the qspisplitdirectxipthing branch from bdf3a72 to 5bf3e83 Compare September 9, 2024 07:41
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Sep 9, 2024
gchwier
gchwier reviewed Sep 9, 2024
View reviewed changes
sysbuild/CMakeLists.txt Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT config? should it be also checked here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DirectXIP with revert mode is not supported in QSPI split image mode because if you confirm one and do not confirm the other, you will reboot into a bricked module

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@nordicjm nordicjm force-pushed the qspisplitdirectxipthing branch from 5bf3e83 to 880591e Compare September 10, 2024 09:02
@nordicjm
manifest: Update sdk-zephyr
42314af 
Updates zephyr to bring in a QSPI XIP split image change

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Add QSPI XIP split image flag setting for DirectXIP mode
b033098 
Sets a flag for MCUmgr img mgmt to allow uploading to the correct
slot when using these specific configuration options

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm force-pushed the qspisplitdirectxipthing branch from 880591e to b033098 Compare September 11, 2024 06:36
@NordicBuilder NordicBuilder removed the DNM label Sep 11, 2024
@nordicjm nordicjm added manifest-zephyr and removed manifest-zephyr changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 11, 2024
@nordicjm nordicjm merged commit cffd61b into nrfconnect:main Sep 11, 2024
16 of 17 checks passed
@nordicjm nordicjm deleted the qspisplitdirectxipthing branch November 6, 2024 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@de-nordic de-nordic de-nordic approved these changes

@gchwier gchwier gchwier approved these changes

@tejlmand tejlmand Awaiting requested review from tejlmand

@carlescufi carlescufi Awaiting requested review from carlescufi

Assignees

No one assigned

Labels

manifest manifest-zephyr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nordicjm @NordicBuilder @de-nordic @gchwier